Interface update and some stability fixes