added runtime support