Added Taxonomy class, ajusts on Post Type class