Added Path support