refactor: replace props map with struct fields (#276)

refactor: replace props map with struct fields (#276) #1074