Added some generic API calls; Fixed schemas