Adding more features to the runtime