Changed class mapping from hash to method
Model class lookup bugfix