Hi, my appologies. I am a bit overwhelmed with work at the moment. I would try to build some base components which can then be put together to represent the actual logic. I would start to port a few functions of the Enhancer and then post it. If you at that point could help me with porting the rest, this would be much appreciated. I think once I layed out the approach, it becomes obvious how to implement the logic. I only need to do a few bits first to allow the "in-bytecode-replacements" of remapping field access to method access.