Working on types
made types use a separate table