Added new tags as well as a better inheritance structure.