Added notify timeout option