Reorganized the interface functions for easier searching and debugging.