Add more keys and format --list output a little bit.