Updated to the latest generic action model