Should have added with previous refactoring