added more precice subtypes and parsing to LUPT