baseDir is now handled on runtime side
Make runtime communications more robust