Refactor and rewrite Rich,Type and CoreToRich