initial changes to support custom "Activity" model / table.