Update Documentation and Work on Database