Added fields and functions