Remove UserMap table and use Keys instead