Added support for deployment