#196, #201, #189

#201: Also updated the Activity Model schema (removed enum)