Added fields and base types