Added def parameter support