Adding support for insert and insert with values