Refactored action package to support multiple services