Refactor description endpoints