Added more configurations