Improve design of activity_setup