Improved external interface.