Updated parsing methods