Added option to disable spinner