Updated the getTypeBySystemCode() function
Added sortOrder to default type data
Updated Type Validation