Adding more assets. Refactoring needed