osc compiling
Made wrapper more generic