Added UKSM support
fixed UKSM