More generic names and add some example attributes