Omion,
Please post modified runtime code also here.
Edit: It looks like no changes required for runtime code.