Add bundle and from_hash