Added more user control features