Added functionality for single sites