Adding API for UTests
Implementing new design