Readme & some extends to API