Removed generic from AbstractParser class. No longer needed in new model