Refactored interfaces. Less is more.