More improvements to RLM Endpoint