First pass at #66, allow importer to determine object type