Added support for scalability