Finishing up parser
Fix for type name changes