[UPDATE] Added possibility to add (and then remove) custom secondary keys