Removed intermediate typing data structure