Add None renderer. Improve Main classes