Changed how objectives are stored