Supporting more configurations