Added UHC plugin integration