Updates to Export Module

Signed-off-by: Pratheek Rebala <pratheekrebala@live.com>