modified models to reflect api changes