Updated some types in preparation for login