Exposing the needed API and corrected missing imports