Added more flags