Finalize asset service and merge refactoring.