Changed definition ordering