Feature/entity editor