Changed to properties from fields.