Updated with the last changes on oldstyle syntax