Dialog field generator classes and annotation updates
Abstract class naming