REstrucured fileds a bit.
Unfortunately nested attributes are not working. So need to fix this

Signed-off-by:  <>