Changed SELECT * to discrete fields