1532 model org dependencies

#1532 dependencies to allow organism-specific properties to be used only in appropriate organisms