Merge boilerplate, update map