Assets manager refactoring