dreamer: This is more or less stable class so we'd prefer minor adjustments only.

Your ideas here.