Change to a scoped activity model