improves oproperty class mapping in cask