Features/update more helpers