Add spree namespace and missing keys