Feature/boilerplate update