Added more support to the decision making mechanism.