Refactored the package into Interceptors rather than transforms