Added last missing model for now
Updated visits model to reflect fields found in Android code
Even more simplification and generalization