Configuration classes added