Added toolbarEnabled property