Modernize ApiPath