API Path handling added