Works with annnotation parser now