Added locale support