Restore statement not null condition
Use #pluck instead of #map