Adding a scope class instead of hard-coded value and decreasing the time limit