Made model loader compatible with resourceSubType and collabdocs

Follow up for Hilary#421