Updated html parser