Added final data extractors