Refactored params into separeted model