Added locale resolver + interceptor