Moved variables to org attributes