Move to maven dependency for OC