Completed Assets Refactoring