Updated extractors for flexibility.