Add the base of the API
Merge the 10.1 branch
Update API resources