Updated timeouts
Updated property