Adding basic parsing of endpoint