adding locale support