Implemented multiple axis support