Moved attrdict and enum to utils