Refactored MarshaledActivity for old Activity class