Add decomposable set and map traits