Fix Definition creation, preserving id attribute