Handle assets better