Added more objectives