Fixed to follow django database structure