Improved build system for dependancy injection