Updated for Common 1.0.0.10