Uncoupling from key value mapping
New podspec