Improving the sites api