Add proper endpoints