Update defs for 584 compatibility
Working on alpha 7 compatibility