I think it's getting too much complicated here. We now have like 4 jumps before getting to the actual code. Can we please simplify all these wrappers?