Simplify implementation to remove extra endpoint