Added some shortcuts
Name refactoring
Adapted to newest libs