Upgrades and enhancement based on SimpleCaddy by Henk