Refactored activities to support more in the future