Refactoring issues bulk creation