Uses new checks for previous inner class registration