Added assembly and mapping wrapper functions