Added support for dual axis