Api methods & other changes