Added some work for attribute processing