Updated to include all fields on admin view