Refactor. Update build.