Updating the documentation and main class