Refactored product module