Added Options API and PS namespace.