Fixed #92, Implemented integration with SI and SC