Modified models + implemented country_code