Fix for issue#342, added missing entity class