Improve error messages
Add container concept to improve scalability when there are a lot of zones to add with loosing speed of refresh