Setup for refactoring and adding selectors for axes