Changed all command objects to take context as per the Strategy pattern