temp
Temporarily replace naics-api for speed improvement
Better model attribute handling