Small definition changes