Added quantum and quanta parsing