Refactored Activity into a simple struct
Added ActivityContainer