Added smart parser