Improved stocks module