Added missing properties as reporting by Scrutinizer