Adding parsing of implements and extends as well as fixing type parameter parsing for those