Assignments are shown in product view + refactoring