Make sure to attach params only if they exist