Change actions to object actions