Minor refactoring due to bugs, json products added