added country field, support for associations