Added Path handler