Added static inner class