Major generalization and configuration update.