[andrei-akopian]

This means we need to add management features without removing any of the above.