fix classes for async loading mapped properties