UI plus some api's added