Improved Scaffolding +  added objects to Bootstrap