Move Codec enrichments to main package