Added asset support