Reworked datasaource arquitecture to support external libraries