Added initial path editin support