Delimiter fix
Support for combination hashkeys and relationships