Add support for system locale