updates and extension of api