Added support for runtime flags