With the generator model, I think it is natural to have two separate trees. It would be up to the separate merge code to transfer the metadata from the "spec" to the "jboss" metadata. The augment for Servlet 3 would operate on the objects from the "spec" package, naturally.