Changed design for ImportControl
Added: Error on parse
Merge some changes
Fixed: interface errors