Updated model with ? support and tests