Added axis.
Some refactoring