Change: Resolve symbols
Heavy refactor: Resolve symbols
Heavy refactor: change naming according to c++ version