Refactoring before adding asset manager.