Added dependancy injection