New functions & interface update