Add support for autorun