Refactored public interface with module