Add additional properties
Limit fields better, add extra config params