Updated app to use builders