Taxonomy reconfigured

Reworked taxonomy code to use functions from other fields.