Added fucntion based upon class