Add User support, missing datastore create and some additional logging