Added supported for more complex site elements