Moved some constants from decorator to factory
2 files changed