Updating with initial code base and Identity class