#910 - Added another concept -- discharge location