Adding ability to set locale