Adding support for preserving multiplication