Reorganized API (regrouped actions together)
Bugfix