Deleted Calalog class and added namedqueries to Supplier