Added support for the UI interface