Updated to remove the need for loading the product model