Added additional functionality to IO.
Removed calls to Source.