Extraction code ready. TODO Use it in all places