Improve admin field generator helper