No more utility models for now
Added support for addresses
Fixed compile bugs