Added helper and partial