DEVIDM: Added proper runtime wrapper.