Added Simplified properties to units and optimized units infoBox