Refactored interfaces.