Modify for boilerplate v2.0