Fix attribute building methods
Fix specs

All specs are green now.