Code simplification
Code simplification
Minimal implementation for the CoreMatch
Minimal implementation for the CoreMatch and lift code