Tree actions refactored