Some more definition handling