Refactor code, add axis baseline type