Initial update of boilerplate template