Added support to extract idioms

Change-Id: I824ec2038fa98165796898825918e8f7f911d27b