Code factorization
Overall improvement of model helper