Further extension of SIIS functionalities