Added somes api and improved others