helper handling improvements