Added Type Field
Merged Swapnil's Changes