Changed model following the schemas