Add enabled flag to picking controller