add locale and validation