Added config classes