Done A1 enrichment more modular. And it is prepared to add new strategies.