Change the mangling/unmangling mechanism

This allows for more complex data types to be realized