Added back inner class for now