Refactoring Ponto Model