Added locale domain support