Boilerplate that matches new arch