changes for making dependencies work from client side