Added more optimization methods