Support interface
Cleaning up interface injection