Changes regarding the inner class