Validation method extracted and timeout values intruduced