Comkort support added