Added base Users and UserGroups mappings with annotations