Added country constants and global id support to finding API