Updated toString methods