I rather believe that the next step will be a rather more generic approach to include the several aspects you mentioned and getting the ability to absorb new ones faster.