list fields annotation improved