Added support for mock ui