Fixed issue with unused properties