Increased timeout on refresh
Refactored Parser