Adding extractors

Adding extractors