Added System Type handling system