Remove the use of autobox
Add generated files