Add more descriptive elements