Added empty template for image datadomain; some cleanup