extended the model and fixed scope injections