Refactored product associations