Dll API reorganized