Adding various resource types
Adding various resource types
Merge fix