Bugfixes and added support for Insert