Replacing Entity#property with hash access
Adding comparison logic