Added more autoload code