Improved defaults