1.5 Support + Taxonomy Fix