Common API JS modules loading fix