Added some support for insertion (broken yet)