Added entities, mappings for activity, schedule