Feature/enhanced hyperdex support