Simplify.
Added documentation.
Revert back to backward compatible syntax.