Updated to make the DSL more consistent.