Change primary key of airport, add country management