Fixed dataapi port/extport