Redo all action inheritance (part 2)