Add support for dynamically labelled axes