Fixes to Mappable.
Added DecodableSingleton.