Improve products interface