Added Timeout class + uses in API where timeouts are specified