Upgrade to Ketchup 0.3