Refactor of constructor.
Update test cases of refactor.
Update docs.
Update version.