Added support for users array