Update yaml extraction methods