Small rework of action system