Updates due to documentation .. may require some fixes on consumer's code.