polish classes, update to RelTypes