Moved "context" from local variable to member variable
also in your "model" classses, commented out auto-generated