Updated boilerplate and package