Improvements on sites api