Added fields for global public