Add extractors

This should fix #13, #14 & #15