Added missing properties generic setup step