Added quite some new annotations types and parser