Added preliminary parameter support