Finalized API for version 1.0