Split model Activity and ActivityCategory