Added model fields — needs testing