Brought back stdin support