Updated models methods