Added additional extensions to the spec.
Added further singleton provider support.
Updated some API aspects slightly.