Added SPI support to overcome issues with ServiceLoader inside OSGI environments