Add option for current visibility