Ported Boilerplate to new architecture