BZ- Inner classes break the Data Modeler