Improve of API and simplified use