Added more print functionality