Fields added, time for pre-mature refactor