Added extra path to get class info and some small fixes