Add more editor support