Added support for element order control