Updates to activity creation/management