Added the possibility to use keys with dots (.)