Changed model to match future change