More refactoring changes to Desktop asset manager