Resolve bugs on Imports. Also DB changes have took place.
More enhancements.