Preliminary support to split api from ui