[NEW,CHG,IMP] A lot of changes, new apis