Added some basic endpoint support