Revert interface change. Will be simiplified at later date.