Refactoring provider state portion of the dsl to match more inline with the ruby version