Species don't care much for administrative borders so until we have the ability to store actual geographical data there is not much to do. Sure, for some islands or lakes it might make sense to tie it to another item but those are special cases for a problem that should be more generally solved. 

/Jan