Now extending the proxy generator for better control over entity state for relationship management