Added some runtime capabilities