Add additional Context flags