Some fixes for class names and queue (added base class).