Better type hierarchy for projects