Reworking all public interfaces.