Added non-const getter for easier serialization
Adapted to newest libs, refactoring
Name refactoring