[fix] Conver struct to class to be able to provide member initialization