Add isEditable field
Refactor