Added metadata value wrapper
Finished Module wrapper
More implementation