Add initial support for import