Added options to control visibility