Cleaned up import & export of objects