Finishing the basic API