Common Type System solution added.