Added base models for Activity and CompletedActivity