Added asset overriding logic