Added support for the Boilerplate