Add support for force conform mode