Extract functionality out of Thor into Builder