Products and services refactor and tweaks