Updated for translations and abstract action