Changed definition format