Adds resource factories
Merge remote-tracking branch 'origin/other'
Finalizes implementation of other resource types