Add some automagic.