Made score model more extendable