Change clazz property inheritance logic