Changes to add the activity creation