Added Enabled flag to parameters