Better support for dependencies