Added console handling to master