#196, #201, #189

#201: Also updated the Activity Model schema (removed enum)
Merge pull request #236 from fgiannar/develop

#196, #201, #189