Extracted ExpiryManager and CommandParser