Add more flags to improve performance