Improved shell and puppet classes