Everything works with the refactored code.