Add more structure to edit