Made better declaration identification system