Cr8it configuration related changes