Add support for timeout property