Add helpers. Fix naming