Tighten up configuration definition