Added option to disable custom messages