Finish migrating to framework