Added locale settings support