TODO Refactoring