breaking changes
Adding new management APIs