Moved to mori data types