removing the 3 BasicXXX classes
adding support for the Full Graph Model ABNF