Added locale listener and user preference