Started working on modified CLR wrappers