Better interrupt support