Updated models with new helpers