Added UX and socket endpoints