LAI-5 Improved pipeline architecture to be more flexible in the types handling (easier to extend)