Completed Entity System. Revised Type system