Removed CSON dependency, added variables in echo