Modified models to not include ContentBase for now