Solved some issues with the layers watch
changed layers object definition