Made SystemModelListener a non-static inner class