remove contry restriction
handle unique constraints on entities