Added language resolver - non-spring style