Modified models to include proper __str__