Cleaned up interaction with generators