Improved integration with Tickets