Updated product model / controller