Added basic endpoint framework