Changed Worktable. Fixed XpStorage