Major refactoring to frontend products references