Add more helpers for scaffolding