Fixed wrong fields definition
Merge remote-tracking branch 'origin/feature/Frontend_interface' into feature/Frontend_interface