Improved boilerplate