Fixed readonly endpoints