Update boilerplate code (working in progress)