Get my User entity in line with the existing schema

This also removes any duplication between user_meta and non-user_meta.