Added better checks for duplicated field type definitions