Fixed def, syntax updates