Some updates for API version 1