Added support for cross