Some old changes and chef check in plugin