Converted classes from anonymous to inner