Add more resource formats
Merge branch 'master' into 43-spatial-search