Changed helpers to new style