Removed binding to container
Updated some models to use App::make instead of Extend::make