builder
refactored generic classes: removed "rawtypes" warnings