Replaced some timeouts with constants