Added more fields to the config. Not working properly, yet.