Use proper timeout and class constant