#228 align management with recent changes.
Merge pull request #229 from joola/feature/#228

#228 align management with recent changes.