Improve path command