Add new managed resources implementation
Code review fixes