Added support for Forever