Fix: making locales optional