Added editable fields