Added support of timeout in MS