Fixed Boilerplate to new Architecture