render claims a bit better
Add more claims