Refactoring to support multiplication directly