Reworking on the GENESYS data dictionary import; temporary commit.