Modified models for the new db schema