Paragraph granularity supported for extrinsic.
Merged with master. Fixed some import issues.