Refact & more keys allowed