More work on keepass importing