[DEV] Primitive key handling