Added a debug interface. Refactored class names.