Add activityDAO and replace code in Activity and Service for use activityDAO