Improved OM usage in scripts.