Add ID flag
Adding more locale code to built in data
Clean code