bugfix + add Editor model
bugfix + add Editor model