modularize codebase
gen: catch more attributes