Changes on design, Added import & export