Made the contrib/scripts a bit more flexible