Changes to _to_hash