Enhancement: set timeout