Change populator API and add enums for divisions