Use extra_keys in as_dict method

Change-Id: Ie1d56689df15a6d8e8b8928aa4905df9ef7627db