Better Documentation and completion