move option entries preparation to model