Added new boilerplate code