Add more boilerplate