updated dependencies
Added validation
added zone handling