Add more fields