Added initial support for imported submissions