Added uptime match support