Further work on entry fields