Actions updated to use the new code