Added logic for dependant factors like compund and dose