Created Assets class and refactored for it