added classes and config