Moved away fro sync package. Added partial Zone support