Moving sid functionality into separate class