Update the implementation code

We need this for scriptEntry's