Fixed: refactoring delegate methods