Constructor fields + CollectExact + parser fixes