exposing more API and correcting missing imports
merging