Merge "Refactor to SimChangeListener class"