Updated to match interfaces.