Proper package struct and fixed for updated tornado.