Fully complex key support

Tested on delete operations. Also succesfully tested when adding
entities with customizations