Better editor experience