Started adding changes for 3.0.0.
New version, since it uses a new namespace, will be called 3.0.