Added extract functions that I had missed earlier...