Added support for dependencies