Added option to disable images