Converted to schema crawler
Refactor using ClassWriters
cleanup