Changes for End User mode