Added more IO functionality