Review round #2: removed enums :cry: