add proper fields