Fully working - added credentials updater