Update to credentials.

#TODO Needs to use properties instead