Get rid of raw types which cause unnecessary warnings