refactoring code with all assets models