Updated: Linked to Issues for categories

+ Better type hierarchy