Removed Factory framework (might lead to bad design)
Added customizations which can partially override system components and resources