Removed dependency on coords module. Improved basic source association.