Improve area endpoint