Added support for Object normalization