Add SpecialSource and perfomance improvements