Adding new boilerplate code