Added mappings for resource and user