Several changes to axis implementation