Refactored interfaces