Adding Surveillance Source and Layouts