Cleanup and refining
Added basic product support