Added Resource and Module type fields