Refactoring to simplify interface.
Refactoring to simplify interface.