More work on imports. TODO : limit imports to needed elements and add tests