Updated with newest puppet modules