Map Plugin now also changed to support the new code generation mechanics