Remove 'type field from mandatory requirements
Add code review changes