Updates to the boilerplate