Use select * projection and fix enumeration