Make fields more DRY