generator fix and user class changes