1. Pick Entity
2. Additional Fields