Added remaining flags