Maybe use some config setting for timeout here instead of hard coded timeout value?