Minor Parser Updates

Updated entity creation code (more changes to come).