Added autorun support