Renaming artifacts
Extracting proxy creation to an object
Interceptor implementation