Add more fields for the server datasource