Added CI Type model and handlers