Documentation and Updated methods