Reworking endpoint to remove request dependency