Property Class/Table fix