Tweaked schema to work with updating activity collection