Revert Array check and endpoint inheritance
Change to simple endpoint creation and store instead of using inheritance