Fix incorrect calls
Introduce dummy key restriction