Add more descriptive fields