- [X] Improve loading keys policy - #156