Separate timeout to long timeout and short timeout