Added initial draft for country and weekdays fields