Added a few more fields and put them to be dynamic