Make the OptimizedAdapterBuilder and some chages like next on the OptimizedDataAdapter and some classes change packages