Adding method stubs and revising the API