Added Scale and better support for symbols