Added goToLoader to interface and refactoring