Updated to work with docker links