Builder class has been fixed.
The AbstractCatalogModel has been fixed to support generics.