Improved handling of substance/concentration distinction in species