Added supporting less on fly compile with buffering