Moved fields selection to model
using scope