add icids, icvs and tidse
address gradle issues