Refactored animation context to allow additive action context composition